From a635929b1ea99cea1ea843726067fd17cc00c0d7 Mon Sep 17 00:00:00 2001 From: "shand@spidean.research.intel-research.net" Date: Thu, 16 Sep 2004 15:15:03 +0000 Subject: [PATCH] bitkeeper revision 1.1159.78.1 (4149adf72Gb8APRtx2_hA1cGWLUEOQ) all build without front end drivers --- BitKeeper/etc/logging_ok | 1 + linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 441337485c..519c80013f 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -39,6 +39,7 @@ rn@wyvis.camb.intel-research.net rn@wyvis.research.intel-research.net rneugeba@wyvis.research rneugeba@wyvis.research.intel-research.net +shand@spidean.research.intel-research.net smh22@boulderdash.cl.cam.ac.uk smh22@labyrinth.cl.cam.ac.uk smh22@tempest.cl.cam.ac.uk diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c index 3a97f04a2a..94ad6175ce 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c @@ -60,10 +60,15 @@ static void __do_suspend(void) suspend_record_t *suspend_record; /* Hmmm... a cleaner interface to suspend/resume blkdevs would be nice. */ + /* XXX SMH: yes it would :-( */ +#ifdef CONFIG_XEN_BLKDEV_FRONTEND extern void blkdev_suspend(void); extern void blkdev_resume(void); +#endif +#ifdef CONFIG_XEN_NETIF_FRONTEND extern void netif_suspend(void); extern void netif_resume(void); +#endif extern void time_suspend(void); extern void time_resume(void); extern unsigned long max_pfn; @@ -77,9 +82,13 @@ static void __do_suspend(void) __cli(); +#ifdef CONFIG_XEN_NETIF_FRONTEND netif_suspend(); +#endif +#ifdef CONFIG_XEN_BLKDEV_FRONTEND blkdev_suspend(); +#endif time_suspend(); @@ -130,9 +139,13 @@ static void __do_suspend(void) time_resume(); +#ifdef CONFIG_XEN_BLKDEV_FRONTEND blkdev_resume(); +#endif +#ifdef CONFIG_XEN_NETIF_FRONTEND netif_resume(); +#endif __sti(); -- 2.30.2